home *** CD-ROM | disk | FTP | other *** search
/ Resource Library: Multimedia / Resource Library: Multimedia.iso / utils / sound / players / unix / xtank / xtank13d.1 < prev   
Encoding:
Text File  |  1993-01-31  |  29.5 KB  |  1,064 lines
  1. #
  2. # xtank1.3d-sound-patches version 1.1
  3. #
  4. # This sound patch to xtank1.3d will only work on Suns workstations
  5. # with sound support.
  6. #
  7. # Note:    This is a patch to an original xtank1.3d _not_ a patch to the
  8. #     previous sound patch.
  9. #
  10. # This is version 1.1 of the xtank-sound-patches.  The following things
  11. # have been added/changed to the previous patch:
  12. #
  13. #     - Sounds only play on your workstation if the source of the sound is
  14. #        visible. (Thanks to Brian Stormont, brs@cs.brown.edu)
  15. #
  16. #    - Different sounds for each type of explosion (electricity, dam0, dam1,
  17. #        etc). (Thanks to Brian Stormont, brs@cs.brown.edu)
  18. #
  19. #    - Sound for the 1960s style radar.  A sound is played for each blip.
  20. #        (Thanks to Brian Stormont, brs@cs.brown.edu)
  21. #
  22. #    - Sound can be turned on/off in the settings-flags menu.
  23. #
  24. # This patch will only work on an original xtank1.3d (as far as I know)
  25. # For sounds to work you must also have the rplay package installed
  26. # on all machines using xtank, this means the server and clients.
  27. # If rplay is not installed on a client machine that client will not
  28. # receive any of the sounds.  The rplay package along with the sound 
  29. # files are available via anonymous ftp at sciences.sdsu.edu.
  30. # The Imakefile in the Src directory also is setup to link with the 
  31. # librplay.a in /usr/local/lib.  If you changed the directory where 
  32. # librplay.a lives you will have to edit the Imakefile in Src.
  33. #
  34. # To apply the sound patch...
  35. # % cd your_xtank_directory (the one with Imakefile.Config)
  36. # % patch -p0 < sound-patches >& patchresults
  37. #
  38. # There is a new directory called Sound which contains a file
  39. # called list.  This file contains a list of all the sound file names
  40. # that are to be used for the appropriate xtank sounds.
  41. #
  42. # Send problems/questions/comments to boyns@sciences.sdsu.edu.
  43. #
  44. # Mark
  45. #
  46. *** /dev/null    Wed Jul  8 10:41:50 1992
  47. --- Sounds/list    Wed Jul  8 10:29:04 1992
  48. ***************
  49. *** 0 ****
  50. --- 1,46 ----
  51. + #
  52. + # This file contains the names of the sound files used for sounds.
  53. + # The numbers in the first column represent the number associated
  54. + # with the #defines in Src/Include/Sound.h.
  55. + # When adding new sounds changes must be made both to the Sound.h
  56. + # and this list.  To change a sound just change the name here.
  57. + #
  58. + 0    click1.au        # lmg
  59. + 1    click1.au        # mg 
  60. + 2    click1.au        # hmg 
  61. + 3    click1.au        # lrifle 
  62. + 4    click1.au        # rifle 
  63. + 5    click1.au        # hrifle 
  64. + 6    click1.au        # lcannon 
  65. + 7    click1.au        # cannon 
  66. + 8    click1.au        # hcannon 
  67. + 9    click1.au        # lrocket 
  68. + 10     click1.au        # rocket 
  69. + 11    click1.au        # hrocket 
  70. + 12    click1.au        # acid 
  71. + 13    click1.au        # flame 
  72. + 14    drip.au            # mine 
  73. + 15    Missle1.au        # seeker 
  74. + 16    click1.au        # slick 
  75. + 17    click1.au        # procket 
  76. + 18    click1.au        # umissle 
  77. + 19    click1.au        # harm 
  78. + 20    click1.au        # disc 
  79. + 21    bong.au            # vehicle hit wall
  80. + 22    better_boing.au        # vehicle hit vehicle
  81. + 23    arrp.au            # bullet hit vehicle
  82. + 24    tap2.au            # bullet hit wall
  83. + 25    boom.au            # tank explosion
  84. + 26    arrp.au            # gleam explosion
  85. + 27    arrp.au            # dam0 explosion
  86. + 28    arrp.au            # dam1 explosion
  87. + 29    arrp.au            # dam2 explosion
  88. + 30    arrp.au            # dam3 explosion
  89. + 31    arrp.au            # dam4 explosion
  90. + 32    arrp.au            # exhaust explosion
  91. + 33    arrp.au            # electric explosion
  92. + 34    arrp.au            # damage explosion
  93. + 35    sub_dive_horn.au    # start
  94. + 36    game_over.au        # end
  95. + 37    Sonar.au        # sonar
  96. + 38    blip.au            # blip
  97. *** /dev/null    Wed Jul  8 10:41:50 1992
  98. --- Src/Include/sound.h    Wed Jul  8 10:27:52 1992
  99. ***************
  100. *** 0 ****
  101. --- 1,66 ----
  102. + #ifndef    _sound_h
  103. + #define    _sound_h
  104. + 
  105. + /*
  106. +  * This file contains the sound indexes into the sound table
  107. +  * The indexes here must be consistent with those in the file Sounds/list
  108. +  */
  109. + 
  110. + /*
  111. +  * maximum number of sounds
  112. +  */
  113. + #define MAX_SOUNDS            128
  114. + 
  115. + /*
  116. +  * sounds for all the types of weapons
  117. +  */
  118. + #define LMG_SOUND            0
  119. + #define MG_SOUND            1
  120. + #define HMG_SOUND            2
  121. + #define LRIFLE_SOUND            3
  122. + #define RIFLE_SOUND            4
  123. + #define HRIFLE_SOUND            5
  124. + #define LCANNON_SOUND            6
  125. + #define CANNON_SOUND            7
  126. + #define HCANNON_SOUND            8
  127. + #define LROCKET_SOUND            9
  128. + #define ROCKET_SOUND            10
  129. + #define HROCKET_SOUND            11
  130. + #define ACID_SOUND            12
  131. + #define FLAME_SOUND            13
  132. + #define MINE_SOUND            14
  133. + #define SEEKER_SOUND            15
  134. + #define SLICK_SOUND            16
  135. + #define PROCKET_SOUND            17
  136. + #define UMISSLE_SOUND            18
  137. + #define HARM_SOUND            19
  138. + #define DISC_SOUND            20
  139. + /*
  140. +  * things hitting things sounds
  141. +  */
  142. + #define VEHICLE_HIT_WALL_SOUND        21
  143. + #define VEHICLE_HIT_VEHICLE_SOUND    22
  144. + #define BULLET_HIT_VEHICLE_SOUND    23
  145. + #define BULLET_HIT_WALL_SOUND        24
  146. + /*
  147. +  * explosion sounds
  148. +  */
  149. + #define TANK_EXPLOSION_SOUND        25
  150. + #define GLEAM_EXPLOSION_SOUND        26
  151. + #define DAM0_EXPLOSION_SOUND        27
  152. + #define DAM1_EXPLOSION_SOUND        28
  153. + #define DAM2_EXPLOSION_SOUND        29
  154. + #define DAM3_EXPLOSION_SOUND        30
  155. + #define DAM4_EXPLOSION_SOUND        31
  156. + #define EXHAUST_EXPLOSION_SOUND        32
  157. + #define ELECTRIC_EXPLOSION_SOUND    33
  158. + #define DAMAGE_EXPLOSION_SOUND        34
  159. + /*
  160. +  * misc sounds
  161. +  */
  162. + #define START_SOUND            35
  163. + #define END_SOUND            36
  164. + #define SONAR_SOUND            37
  165. + #define BLIP_SOUND            38
  166. + 
  167. + #endif    _sound_h
  168. *** /dev/null    Wed Jul  8 10:41:50 1992
  169. --- Src/sound.c    Mon Jul  6 11:34:55 1992
  170. ***************
  171. *** 0 ****
  172. --- 1,206 ----
  173. + #include "limits.h"
  174. + #include "xtank.h"
  175. + #include "graphics.h"
  176. + #include "gr.h"
  177. + #include "xtanklib.h"
  178. + #include "vehicle.h"
  179. + #include "globals.h"
  180. + #include "terminal.h"
  181. + #include "assert.h"
  182. + #include <sys/types.h>
  183. + #include <sys/param.h>
  184. + #include <sys/socket.h>
  185. + #include <netinet/in.h>
  186. + #include <netdb.h>
  187. + #include <stdio.h>
  188. + #ifdef SOUND
  189. + #include "sound.h"
  190. + 
  191. + extern Terminal    *terminal[];
  192. + extern int    num_terminals;
  193. + extern Settings    settings;
  194. + 
  195. + /*
  196. +  * the sound table
  197. +  */
  198. + int    sound_table[MAX_TERMINALS][MAX_SOUNDS];
  199. + 
  200. + /*
  201. +  * initialize sound for the given terminal
  202. +  */
  203. + init_terminal_sound(t)
  204. + Terminal    *t;
  205. + {
  206. +     int        index, id, bind_fd;
  207. +     char        *p, *rindex();
  208. +     char        host[MAXHOSTNAMELEN], buf[MAXPATHLEN], name[MAXPATHLEN];
  209. +     Video        *vidptr;
  210. +     extern char    pathname[], soundsdir[];
  211. +     char        filename[MAXPATHLEN];
  212. +     FILE        *fp;
  213. + 
  214. +     draw_text_rc(ANIM_WIN, 0, 1, "Initializing Sounds...", M_FONT, WHITE);
  215. +     sync_output(TRUE);
  216. + 
  217. +     /*
  218. +      * get the display hostname 
  219. +      */
  220. +     vidptr = (Video *)t->video;
  221. +     sprintf(host, "%s", vidptr->display_name);
  222. +     p = rindex(host, ':');
  223. +     *p = '\0';
  224. +     if (*host == '\0') {
  225. +         strcat(host, "localhost");
  226. +     }
  227. + 
  228. +     /*
  229. +      * initialize rplayd connection
  230. +      */
  231. +     t->rplay_fd = rplay_init(host);
  232. +     if (t->rplay_fd < 0) {
  233. +         rplay_perror(host);
  234. +         return -1;
  235. +     }
  236. + 
  237. +     /*
  238. +      * initialize rplaybindd connection
  239. +      */
  240. +     bind_fd = rplaybind_init(host);
  241. +     if (bind_fd < 0) {
  242. +         rplay_perror(host);
  243. +         close(t->rplay_fd);
  244. +         t->rplay_fd = -1;
  245. +         return -1;
  246. +     }
  247. + 
  248. +     strcpy(filename, pathname);
  249. +     strcat(filename, "/");
  250. +     strcat(filename, soundsdir);
  251. +     strcat(filename, "/");
  252. +     strcat(filename, "list");
  253. + 
  254. +     fp = fopen(filename, "r");
  255. +     if (fp == NULL) {
  256. +         fprintf(stderr, "Could not open file %s.\n", filename);
  257. +         exit(1);
  258. +     }
  259. + 
  260. +     /*
  261. +      * bind all the sounds in the sounds list to the host
  262. +      * store the returned sound ids in the sound table
  263. +      */
  264. +     while(fgets(buf, sizeof(buf), fp) != NULL) {
  265. +         if (buf[0] == '#' || buf[0] == '\n') continue;
  266. +         sscanf(buf, "%d %s", &index, name);
  267. +         id = rplaybind(bind_fd, name);
  268. +         if (id < 0) {
  269. +             rplay_perror(host);
  270. +             t->rplay_fd = -1;
  271. +             return -1;
  272. +         }
  273. +         if (id == 0) {
  274. +             fprintf(stderr, "%s not found at %s\n", name, host);
  275. +             id = -1;
  276. +         }
  277. +         sound_table[t->num][index] = id;
  278. +     } 
  279. + 
  280. +     /*
  281. +      * close the rplaybindd connection
  282. +      */
  283. +     close(bind_fd);
  284. + 
  285. +     play_terminal(t, SONAR_SOUND);
  286. + 
  287. +     return 0;
  288. + }
  289. + 
  290. + /*
  291. +  * play a sound on a terminal
  292. +  */
  293. + play_terminal(t, index)
  294. + Terminal    *t;
  295. + int        index;
  296. + {
  297. +     if (!settings.si.no_sound) {
  298. +         if (t->rplay_fd > 0 && sound_table[t->num][index] > 0)
  299. +             rplay(t->rplay_fd, sound_table[t->num][index]);
  300. +     }
  301. + }
  302. + 
  303. + /*
  304. +  * play a sound on all terminals
  305. +  */
  306. + play_all(index)
  307. + int    index;
  308. + {
  309. +     if (!settings.si.no_sound) {
  310. +         int    x;
  311. +     
  312. +         for(x = 0; x < num_terminals; x++)
  313. +             if (terminal[x]->rplay_fd > 0 && sound_table[terminal[x]->num][index] > 0)
  314. +                 rplay(terminal[x]->rplay_fd, sound_table[terminal[x]->num][index]);
  315. +     }
  316. + }
  317. + 
  318. + /*
  319. +  * play a sound on the terminal "owning" or watching this tank
  320. +  */
  321. + play_owner(vehicle, index)
  322. + Vehicle        *vehicle;
  323. + int        index;
  324. + {
  325. +     if (!settings.si.no_sound) {
  326. +         int    x, y;
  327. + 
  328. +         for (x = 0; x < vehicle->owner->num_players; x++) {
  329. +             y = vehicle->owner->player[x];
  330. +             if (terminal[y]->rplay_fd > 0 && sound_table[terminal[y]->num][index] > 0)
  331. +                 rplay(terminal[y]->rplay_fd, sound_table[terminal[y]->num][index]);
  332. +         }
  333. +     }
  334. + }
  335. + 
  336. + /*
  337. +  * play a sound on the terminal that has this location in view
  338. +  */
  339. + play_in_view(loc, index)
  340. + Loc    *loc;
  341. + int    index;
  342. + {
  343. +     if (!settings.si.no_sound) {
  344. +         int    x, dx, dy;
  345. +         int    t_x = loc->x;
  346. +         int    t_y = loc->y;
  347. + 
  348. +         for (x = 0; x < num_terminals; x++) {
  349. +             dx = t_x - terminal[x]->loc.x;
  350. +             dy = t_y - terminal[x]->loc.y;
  351. +             if (dx >= 0 && dx <= ANIM_WIN_WIDTH && dy >= 0 && dy <= ANIM_WIN_HEIGHT &&
  352. +                 terminal[x]->rplay_fd > 0 && sound_table[terminal[x]->num][index] > 0)
  353. +                 rplay(terminal[x]->rplay_fd, sound_table[terminal[x]->num][index]);
  354. +         }
  355. +     }
  356. + }
  357. + 
  358. + /*
  359. +  * play a sound on the terminal that has this location in view
  360. +  */
  361. + play_in_view_x_y(t_x, t_y, index)
  362. + int    t_x;
  363. + int    t_y;
  364. + int    index;
  365. + {
  366. +     if (!settings.si.no_sound) {
  367. +         int    x, dx, dy;
  368. + 
  369. +         for (x = 0; x < num_terminals; x++) {
  370. +             dx = t_x - terminal[x]->loc.x;
  371. +             dy = t_y - terminal[x]->loc.y;
  372. +             if (dx >= 0 && dx <= ANIM_WIN_WIDTH && dy >= 0 && dy <= ANIM_WIN_HEIGHT &&
  373. +                 terminal[x]->rplay_fd > 0 && sound_table[terminal[x]->num][index] > 0)
  374. +                 rplay(terminal[x]->rplay_fd, sound_table[terminal[x]->num][index]);
  375. +         }
  376. +     }
  377. + }
  378. + #endif SOUND
  379. Common subdirectories: ./Bin and ../xtank1.3d-sound/Bin
  380. Common subdirectories: ./Doc and ../xtank1.3d-sound/Doc
  381. Common subdirectories: ./Help and ../xtank1.3d-sound/Help
  382. diff -c -r ./Imakefile.Config ../xtank1.3d-sound/Imakefile.Config
  383. *** ./Imakefile.Config    Sun Feb  9 21:28:45 1992
  384. --- ../xtank1.3d-sound/Imakefile.Config    Wed Jun 24 12:55:14 1992
  385. ***************
  386. *** 152,162 ****
  387.   /**/# recreate the bug!)
  388.   /**/# Most sites should leave it undefined.
  389.   /**/#
  390.   /**/# Everybody needs to know the following global things about xtank
  391.   
  392.   DEFINES2        = -DX11 -DUNIX -DS1024x864 -DKEYPAD_DETECT \
  393.           -DSTINGY_REDRAW -DBATCH_LINES -DBATCH_POINTS \
  394. !         -DCODE_SIZE=0x20000 -DSTACK_SIZE=0x8000 $(ARCH_DEFINES)
  395.   
  396.   DEFINES         = -DXTANK_DIR=\"/src/pub/xtank\" $(DEFINES2) \
  397.           -DALLDEFINES="\"$(DEFINES2)\""
  398. --- 152,167 ----
  399.   /**/# recreate the bug!)
  400.   /**/# Most sites should leave it undefined.
  401.   /**/#
  402. + /**/# -DSOUND
  403. + /**/# Enable only if you are using a Sun with sound support.
  404. + /**/# You must also have the rplay sound package for sound to work.
  405. + /**/#
  406.   /**/# Everybody needs to know the following global things about xtank
  407.   
  408.   DEFINES2        = -DX11 -DUNIX -DS1024x864 -DKEYPAD_DETECT \
  409.           -DSTINGY_REDRAW -DBATCH_LINES -DBATCH_POINTS \
  410. !         -DCODE_SIZE=0x20000 -DSTACK_SIZE=0x8000 $(ARCH_DEFINES) \
  411. !         -DSOUND
  412.   
  413.   DEFINES         = -DXTANK_DIR=\"/src/pub/xtank\" $(DEFINES2) \
  414.           -DALLDEFINES="\"$(DEFINES2)\""
  415. Common subdirectories: ./Mazes and ../xtank1.3d-sound/Mazes
  416. Common subdirectories: ./Programs and ../xtank1.3d-sound/Programs
  417. Only in ../xtank1.3d-sound: Sounds
  418. Common subdirectories: ./Src and ../xtank1.3d-sound/Src
  419. Common subdirectories: ./Todo and ../xtank1.3d-sound/Todo
  420. Common subdirectories: ./Util and ../xtank1.3d-sound/Util
  421. Common subdirectories: ./Vehicles and ../xtank1.3d-sound/Vehicles
  422. diff -c -r ./Bin/xtank ../xtank1.3d-sound/Bin/xtank
  423. *** ./Bin/xtank    Sat Feb  1 14:00:59 1992
  424. --- ../xtank1.3d-sound/Bin/xtank    Wed Jul  8 09:58:57 1992
  425. ***************
  426. *** 3,8 ****
  427. --- 3,9 ----
  428.   XTANK_VEHICLES=Vehicles
  429.   XTANK_MAZES=Mazes
  430.   XTANK_PROGRAMS=Programs
  431. + XTANK_SOUNDS=Sounds
  432.   
  433.   #
  434.   # rpotter thinks this is a kludge, I think it is funny! (lidl)
  435. Common subdirectories: ./Doc/Src and ../xtank1.3d-sound/Doc/Src
  436. Common subdirectories: ./Programs/Old and ../xtank1.3d-sound/Programs/Old
  437. Common subdirectories: ./Programs/Old/Old and ../xtank1.3d-sound/Programs/Old/Old
  438. Common subdirectories: ./Src/Fixed-Point and ../xtank1.3d-sound/Src/Fixed-Point
  439. diff -c -r ./Src/Imakefile ../xtank1.3d-sound/Src/Imakefile
  440. *** ./Src/Imakefile    Sun Feb  9 21:46:14 1992
  441. --- ../xtank1.3d-sound/Src/Imakefile    Wed Jun 24 12:55:16 1992
  442. ***************
  443. *** 17,23 ****
  444.                       objects.c program.c radar.c repair.c scroll.c setup.c \
  445.                       setups.c status.c sysdep.c thread.c unix.c update.c \
  446.                       util.c vdesign.c vehicle.c newfile.c vload.c \
  447. !                     version.c $(SRCS2)
  448.                OBJS = 3d.o XMultiSync.o actions.o animate.o box.o collision.o \
  449.                       console.o cosell.o display.o escher.o explosion.o \
  450.                       file.o game.o gr.o graphics.o highlib.o hit.o icounter.o \
  451. --- 17,23 ----
  452.                       objects.c program.c radar.c repair.c scroll.c setup.c \
  453.                       setups.c status.c sysdep.c thread.c unix.c update.c \
  454.                       util.c vdesign.c vehicle.c newfile.c vload.c \
  455. !                     sound.c version.c $(SRCS2)
  456.                OBJS = 3d.o XMultiSync.o actions.o animate.o box.o collision.o \
  457.                       console.o cosell.o display.o escher.o explosion.o \
  458.                       file.o game.o gr.o graphics.o highlib.o hit.o icounter.o \
  459. ***************
  460. *** 26,32 ****
  461.                       objects.o program.o radar.o repair.o scroll.o setup.o \
  462.                       setups.o status.o sysdep.o thread.o unix.o update.o \
  463.                       util.o vdesign.o vehicle.o newfile.o vload.o \
  464. !                     version.o $(OBJS2)
  465.                INCL = Include/bullet.h Include/common.h Include/cosell.h \
  466.                       Include/disc.h Include/game.h Include/globals.h \
  467.                       Include/gr.h Include/graphics.h Include/icounter.h \
  468. --- 26,32 ----
  469.                       objects.o program.o radar.o repair.o scroll.o setup.o \
  470.                       setups.o status.o sysdep.o thread.o unix.o update.o \
  471.                       util.o vdesign.o vehicle.o newfile.o vload.o \
  472. !                     sound.o version.o $(OBJS2)
  473.                INCL = Include/bullet.h Include/common.h Include/cosell.h \
  474.                       Include/disc.h Include/game.h Include/globals.h \
  475.                       Include/gr.h Include/graphics.h Include/icounter.h \
  476. ***************
  477. *** 40,46 ****
  478.                       Include/terminal.h Include/thread.h Include/tread-defs.h \
  479.                       Include/types.h Include/vdesc.h Include/vehicle.h \
  480.                       Include/vehicleparts.h Include/vstructs.h \
  481. !                     Include/weapon-defs.h Include/xtank.h Include/xtanklib.h
  482.               XINCL = Include/Xlibos.h Include/x11.h
  483.   
  484.   /**/# Note that both x11.c and mazeconv.c are included in other .c files,
  485. --- 40,47 ----
  486.                       Include/terminal.h Include/thread.h Include/tread-defs.h \
  487.                       Include/types.h Include/vdesc.h Include/vehicle.h \
  488.                       Include/vehicleparts.h Include/vstructs.h \
  489. !                     Include/weapon-defs.h Include/xtank.h Include/xtanklib.h \
  490. !                     Include/sound.h
  491.               XINCL = Include/Xlibos.h Include/x11.h
  492.   
  493.   /**/# Note that both x11.c and mazeconv.c are included in other .c files,
  494. ***************
  495. *** 52,58 ****
  496.   
  497.   /**/# Everybody needs the following libraries
  498.   
  499. !   EXTRA_LIBRARIES = -LPrograms -lxtankrobots -lm
  500.   
  501.   /**/# Start of System Dependent Things
  502.   /**/# (e.g. libraries, linker flags and so forth)
  503. --- 53,59 ----
  504.   
  505.   /**/# Everybody needs the following libraries
  506.   
  507. !   EXTRA_LIBRARIES = -LPrograms -lxtankrobots -lm -L/usr/local/lib -lrplay
  508.   
  509.   /**/# Start of System Dependent Things
  510.   /**/# (e.g. libraries, linker flags and so forth)
  511. ***************
  512. *** 89,95 ****
  513.   #endif
  514.   #ifdef SunArchitecture
  515.       SYS_LIBRARIES = /usr/lib/debug/malloc.o -llwp
  516. !         CCOPTIONS = -Bstatic
  517.   #ifdef SparcArchitecture
  518.   /**/# Sun4
  519.   #else
  520. --- 90,96 ----
  521.   #endif
  522.   #ifdef SunArchitecture
  523.       SYS_LIBRARIES = /usr/lib/debug/malloc.o -llwp
  524. !         CCOPTIONS = /**/#-Bstatic
  525.   #ifdef SparcArchitecture
  526.   /**/# Sun4
  527.   #else
  528. Common subdirectories: ./Src/Include and ../xtank1.3d-sound/Src/Include
  529. Common subdirectories: ./Src/Objects and ../xtank1.3d-sound/Src/Objects
  530. Common subdirectories: ./Src/Old and ../xtank1.3d-sound/Src/Old
  531. Common subdirectories: ./Src/Programs and ../xtank1.3d-sound/Src/Programs
  532. diff -c -r ./Src/explosion.c ../xtank1.3d-sound/Src/explosion.c
  533. *** ./Src/explosion.c    Sun Feb  9 21:45:40 1992
  534. --- ../xtank1.3d-sound/Src/explosion.c    Mon Jul  6 09:41:12 1992
  535. ***************
  536. *** 13,20 ****
  537.   #include "bullet.h"
  538.   #include "graphics.h"
  539.   #include "loc.h"
  540.   
  541. - 
  542.   #define EXP_SPREAD 15
  543.   
  544.   
  545. --- 13,22 ----
  546.   #include "bullet.h"
  547.   #include "graphics.h"
  548.   #include "loc.h"
  549. + #ifdef SOUND
  550. + #include "sound.h"
  551. + #endif SOUND
  552.   
  553.   #define EXP_SPREAD 15
  554.   
  555.   
  556. ***************
  557. *** 32,37 ****
  558. --- 34,75 ----
  559.   
  560.       if (eset->number >= MAX_EXPS)
  561.       return;
  562. + 
  563. + #ifdef SOUND
  564. +     switch (type) {
  565. +         case EXP_TANK:
  566. +             play_in_view(loc, TANK_EXPLOSION_SOUND);
  567. +             break;
  568. +         case EXP_GLEAM:
  569. +             play_in_view(loc, GLEAM_EXPLOSION_SOUND);
  570. +             break;
  571. +         case EXP_DAM0:
  572. +             play_in_view(loc, DAM0_EXPLOSION_SOUND);
  573. +             break;
  574. +         case EXP_DAM1:
  575. +              play_in_view(loc, DAM1_EXPLOSION_SOUND);
  576. +             break;
  577. +        case EXP_DAM2:
  578. +             play_in_view(loc, DAM2_EXPLOSION_SOUND);
  579. +             break;
  580. +         case EXP_DAM3:
  581. +             play_in_view(loc, DAM3_EXPLOSION_SOUND);
  582. +             break;
  583. +         case EXP_DAM4:
  584. +             play_in_view(loc, DAM4_EXPLOSION_SOUND);
  585. +             break;
  586. +         case EXP_EXHAUST:
  587. +             play_in_view(loc, EXHAUST_EXPLOSION_SOUND);
  588. +             break;
  589. +         case EXP_ELECTRIC:
  590. +             play_in_view(loc, ELECTRIC_EXPLOSION_SOUND);
  591. +             break;
  592. +         default:
  593. +             play_in_view(loc, DAMAGE_EXPLOSION_SOUND);
  594. +             break;
  595. +     }
  596. + #endif SOUND
  597. + 
  598.       e = eset->list[eset->number++];
  599.       e->x = (int) loc->x;
  600.       e->y = (int) loc->y;
  601. ***************
  602. *** 58,63 ****
  603. --- 96,102 ----
  604.       int exp_dx, exp_dy;
  605.       int i;
  606.   
  607. +    
  608.       for (i = 0; i < num; i++) {
  609.       exp_loc = *loc;
  610.       exp_dx = rnd(EXP_SPREAD << 1) - EXP_SPREAD;
  611. diff -c -r ./Src/file.c ../xtank1.3d-sound/Src/file.c
  612. *** ./Src/file.c    Sun Feb  9 21:45:41 1992
  613. --- ../xtank1.3d-sound/Src/file.c    Wed Jul  8 09:30:04 1992
  614. ***************
  615. *** 120,125 ****
  616. --- 120,128 ----
  617.   char pathname[MAXPATHLEN];
  618.   char headersdir[MAXPATHLEN];    /* full name of directory to find headers in */
  619.   char vehiclesdir[MAXNAMLEN], mazesdir[MAXNAMLEN], programsdir[MAXNAMLEN];
  620. + #ifdef SOUND
  621. + char soundsdir[MAXPATHLEN];
  622. + #endif SOUND
  623.   char username[MAX_STRING], displayname[256];
  624.   
  625.   #ifdef NEED_AUX_FONT
  626. ***************
  627. *** 168,174 ****
  628.       (void) strcpy(filename, "XVDIR:list");
  629.   #endif /* AMIGA */
  630.   
  631. !     draw_text_rc(ANIM_WIN, 0, 1, "Reading vehicle list...", M_FONT, WHITE);
  632.       sync_output(TRUE);
  633.       if ((file = fopen(filename, "r")) != NULL)
  634.       {
  635. --- 171,177 ----
  636.       (void) strcpy(filename, "XVDIR:list");
  637.   #endif /* AMIGA */
  638.   
  639. !     draw_text_rc(ANIM_WIN, 0, 2, "Reading vehicle list...", M_FONT, WHITE);
  640.       sync_output(TRUE);
  641.       if ((file = fopen(filename, "r")) != NULL)
  642.       {
  643. ***************
  644. *** 196,202 ****
  645.       (void) strcpy(filename, "XMDIR:list");
  646.   #endif /* AMIGA */
  647.   
  648. !     draw_text_rc(ANIM_WIN, 0, 2, "Reading maze list...", M_FONT, WHITE);
  649.       sync_output(TRUE);
  650.       if ((file = fopen(filename, "r")) != NULL)
  651.       {
  652. --- 199,205 ----
  653.       (void) strcpy(filename, "XMDIR:list");
  654.   #endif /* AMIGA */
  655.   
  656. !     draw_text_rc(ANIM_WIN, 0, 3, "Reading maze list...", M_FONT, WHITE);
  657.       sync_output(TRUE);
  658.       if ((file = fopen(filename, "r")) != NULL)
  659.       {
  660. ***************
  661. *** 729,734 ****
  662. --- 732,740 ----
  663.       strcpy(vehiclesdir, (p = getenv("XTANK_VEHICLES")) ? p : "Vehicles");
  664.       strcpy(mazesdir, (p = getenv("XTANK_MAZES")) ? p : "Mazes");
  665.       strcpy(programsdir, (p = getenv("XTANK_PROGRAMS")) ? p : "Programs");
  666. + #ifdef SOUND
  667. +     strcpy(soundsdir, (p = getenv("XTANK_SOUNDS")) ? p : "Sounds");
  668. + #endif SOUND
  669.       if ((p = getenv("XTANK_HEADERS")) != NULL) {
  670.           strcpy(headersdir, p);
  671.       } else {
  672. diff -c -r ./Src/gr.c ../xtank1.3d-sound/Src/gr.c
  673. *** ./Src/gr.c    Sun Feb  9 21:45:43 1992
  674. --- ../xtank1.3d-sound/Src/gr.c    Wed Jun 24 12:55:17 1992
  675. ***************
  676. *** 134,139 ****
  677. --- 134,143 ----
  678.       /* Initialize 3D values for terminal */
  679.       init_terminal_3d(t);
  680.   
  681. + #ifdef SOUND
  682. +     init_terminal_sound(t);
  683. + #endif SOUND
  684. + 
  685.       return 0;
  686.   }
  687.   
  688. ***************
  689. *** 174,179 ****
  690. --- 178,188 ----
  691.   close_terminal(t)
  692.   Terminal *t;
  693.   {
  694. + #ifdef SOUND
  695. +     if (t->rplay_fd > 0) {
  696. +         close(t->rplay_fd);
  697. +     }
  698. + #endif SOUND
  699.       close_video((Video *) t->video);
  700.       free((char *) t);
  701.   }
  702. diff -c -r ./Src/hit.c ../xtank1.3d-sound/Src/hit.c
  703. *** ./Src/hit.c    Sun Feb  9 21:45:45 1992
  704. --- ../xtank1.3d-sound/Src/hit.c    Mon Jul  6 09:29:07 1992
  705. ***************
  706. *** 52,59 ****
  707.   #include "terminal.h"
  708.   #include "cosell.h"
  709.   #include "globals.h"
  710.   
  711. - 
  712.   extern Map real_map;
  713.   extern Settings settings;
  714.   
  715. --- 52,61 ----
  716.   #include "terminal.h"
  717.   #include "cosell.h"
  718.   #include "globals.h"
  719. + #ifdef SOUND
  720. + #include "sound.h"
  721. + #endif SOUND
  722.   
  723.   extern Map real_map;
  724.   extern Settings settings;
  725.   
  726. ***************
  727. *** 98,103 ****
  728. --- 100,109 ----
  729.       Side side;
  730.       int has_ramplate1, has_ramplate2;
  731.   
  732. + #ifdef SOUND
  733. +     play_in_view(v1->loc, VEHICLE_HIT_VEHICLE_SOUND);
  734. + #endif SOUND
  735. + 
  736.   #ifdef GDEBUG
  737.       int itemp1, itemp2;
  738.       static FILE *statfile = NULL;
  739. ***************
  740. *** 196,201 ****
  741. --- 202,211 ----
  742.       int dx, dy, damage, damage1, damage2;
  743.       int has_ramplate = FALSE;
  744.   
  745. + #ifdef SOUND
  746. +     play_in_view(v->loc, VEHICLE_HIT_WALL_SOUND); 
  747. + #endif SOUND
  748. + 
  749.   #ifdef GDEBUG
  750.       int itemp1, itemp2;
  751.       static FILE *statfile = NULL;
  752. ***************
  753. *** 596,601 ****
  754. --- 606,614 ----
  755.       b->flags &= ~wl;
  756.       /* tell all the combatants to update their map */
  757.       invalidate_maps();
  758. + #ifdef SOUND
  759. +     play_in_view_x_y(x, y, TANK_EXPLOSION_SOUND);
  760. + #endif SOUND
  761.       }
  762.   
  763.       return damage;
  764. diff -c -r ./Src/init.c ../xtank1.3d-sound/Src/init.c
  765. *** ./Src/init.c    Sun Feb  9 21:45:47 1992
  766. --- ../xtank1.3d-sound/Src/init.c    Mon Jul  6 11:37:06 1992
  767. ***************
  768. *** 94,99 ****
  769. --- 94,102 ----
  770.           FALSE,        /* Boolean no_nametags */
  771.           TRUE,       /* Boolean team_score GHS */
  772.           FALSE,        /* Boolean no_radar */
  773. + #ifdef SOUND
  774. +         FALSE,        /* Boolean no_sound */
  775. + #endif SOUND
  776.   
  777.           10000,        /* int winning_score GHS */
  778.           20,            /* int takeover_time */
  779. diff -c -r ./Src/interface.c ../xtank1.3d-sound/Src/interface.c
  780. *** ./Src/interface.c    Wed Feb 12 22:10:34 1992
  781. --- ../xtank1.3d-sound/Src/interface.c    Mon Jul  6 11:37:37 1992
  782. ***************
  783. *** 205,211 ****
  784.               "No wear", "Restart", "Commentator", "Full map",
  785.               "Pay to Play", "Robots don't Win",
  786.               "Scale Armor to Max", "No name tags",
  787. !             "Team Scoring","Disable RADAR"
  788.               },
  789.       *programs_entries[MAX_PDESCS],
  790.       *players_entries[MAX_TERMINALS];
  791. --- 205,214 ----
  792.               "No wear", "Restart", "Commentator", "Full map",
  793.               "Pay to Play", "Robots don't Win",
  794.               "Scale Armor to Max", "No name tags",
  795. !             "Team Scoring","Disable RADAR",
  796. ! #ifdef SOUND
  797. !                         "Disable Sound"
  798. ! #endif SOUND
  799.               },
  800.       *programs_entries[MAX_PDESCS],
  801.       *players_entries[MAX_TERMINALS];
  802. ***************
  803. *** 293,300 ****
  804.           menu_set_hil(&menu_sys, FLAGS_MENU, 10);
  805.       if (settings.si.team_score)
  806.           menu_set_hil(&menu_sys, FLAGS_MENU, 11);
  807. !     if (settings.si.no_radar)
  808.           menu_set_hil(&menu_sys, FLAGS_MENU, 12);
  809.   
  810.   }
  811.   
  812. --- 296,307 ----
  813.           menu_set_hil(&menu_sys, FLAGS_MENU, 10);
  814.       if (settings.si.team_score)
  815.           menu_set_hil(&menu_sys, FLAGS_MENU, 11);
  816. !     if (settings.si.no_radar)
  817.           menu_set_hil(&menu_sys, FLAGS_MENU, 12);
  818. + #ifdef SOUND
  819. +     if (settings.si.no_sound)
  820. +         menu_set_hil(&menu_sys, FLAGS_MENU, 13);
  821. + #endif SOUND
  822.   
  823.   }
  824.   
  825. ***************
  826. *** 729,734 ****
  827. --- 736,746 ----
  828.           case 12:
  829.               settings.si.no_radar ^= TRUE;
  830.               break;
  831. + #ifdef SOUND
  832. +         case 13:
  833. +             settings.si.no_sound ^= TRUE;
  834. +             break;
  835. + #endif SOUND
  836.       }
  837.   }
  838.   
  839. diff -c -r ./Src/lowlib.c ../xtank1.3d-sound/Src/lowlib.c
  840. *** ./Src/lowlib.c    Sun Feb  9 21:45:52 1992
  841. --- ../xtank1.3d-sound/Src/lowlib.c    Wed Jul  8 10:04:36 1992
  842. ***************
  843. *** 73,78 ****
  844. --- 73,81 ----
  845.   #include "cosell.h"
  846.   #include "outpost.h"
  847.   #include "globals.h"
  848. + #ifdef SOUND
  849. + #include "sound.h"
  850. + #endif SOUND
  851.   
  852.   extern Weapon_stat weapon_stat[];
  853.   extern Armor_stat armor_stat[];
  854. ***************
  855. *** 684,689 ****
  856. --- 687,760 ----
  857.   #endif /* !NO_NEW_RADAR */
  858.           make_bullet(cv, &bloc, w->type, angle + PI / 100 * (50 - rnd(101)) / 50);
  859.       }
  860. + 
  861. + #ifdef SOUND
  862. +     switch(w->type) {
  863. +     case LMG:
  864. +         play_in_view(cv->loc, LMG_SOUND);
  865. +         break;
  866. +     case MG:
  867. +         play_in_view(cv->loc, MG_SOUND);
  868. +         break;
  869. +     case HMG:
  870. +         play_in_view(cv->loc, HMG_SOUND);
  871. +         break;
  872. +     case LRIFLE:
  873. +         play_in_view(cv->loc, LRIFLE_SOUND);
  874. +         break;
  875. +     case RIFLE:
  876. +         play_in_view(cv->loc, RIFLE_SOUND);
  877. +         break;
  878. +     case HRIFLE:
  879. +         play_in_view(cv->loc, HRIFLE_SOUND);
  880. +         break;
  881. +     case LCANNON:
  882. +         play_in_view(cv->loc, LCANNON_SOUND);
  883. +         break;
  884. +     case CANNON:
  885. +         play_in_view(cv->loc, CANNON_SOUND);
  886. +         break;
  887. +     case HCANNON:
  888. +         play_in_view(cv->loc, HCANNON_SOUND);
  889. +         break;
  890. +     case LROCKET:
  891. +         play_in_view(cv->loc, LROCKET_SOUND);
  892. +         break;
  893. +     case ROCKET:
  894. +         play_in_view(cv->loc, ROCKET_SOUND);
  895. +         break;
  896. +     case HROCKET:
  897. +         play_in_view(cv->loc, HROCKET_SOUND);
  898. +         break;
  899. +     case ACID:
  900. +         play_in_view(cv->loc, ACID_SOUND);
  901. +         break;
  902. +     case FLAME:
  903. +         play_in_view(cv->loc, FLAME_SOUND);
  904. +         break;
  905. +     case MINE:
  906. +         play_in_view(cv->loc, MINE_SOUND);
  907. +         break;
  908. +     case SEEKER:
  909. +         play_in_view(cv->loc, SEEKER_SOUND);
  910. +         break;
  911. +     case SLICK:
  912. +         play_in_view(cv->loc, SLICK_SOUND);
  913. +         break;
  914. +     case PROCKET:
  915. +         play_in_view(cv->loc, PROCKET_SOUND);
  916. +         break;
  917. +     case UMISSLE:
  918. +         play_in_view(cv->loc, UMISSLE_SOUND);
  919. +         break;
  920. +     case HARM:
  921. +         play_in_view(cv->loc, HARM_SOUND);
  922. +         break;
  923. +     case DISC:
  924. +         play_in_view(cv->loc, DISC_SOUND);
  925. +         break;
  926. +     }
  927. + #endif SOUND
  928.       }
  929.   
  930.       check_time();
  931. diff -c -r ./Src/main.c ../xtank1.3d-sound/Src/main.c
  932. *** ./Src/main.c    Sun Feb  9 21:45:53 1992
  933. --- ../xtank1.3d-sound/Src/main.c    Wed Jun 24 12:55:18 1992
  934. ***************
  935. *** 252,257 ****
  936. --- 252,258 ----
  937.       debug("Opening graphics toolkit");
  938.       open_graphics();
  939.   
  940. + 
  941.       /* Parse command line for display names and make a terminal for each one */
  942.       debug("Making terminals");
  943.       if (argc - iNumOpts > 1)
  944. diff -c -r ./Src/radar.c ../xtank1.3d-sound/Src/radar.c
  945. *** ./Src/radar.c    Sun Feb  9 21:46:03 1992
  946. --- ../xtank1.3d-sound/Src/radar.c    Wed Jul  8 10:08:55 1992
  947. ***************
  948. *** 45,50 ****
  949. --- 45,53 ----
  950.   #include "map.h"
  951.   #include "vehicle.h"
  952.   #include "globals.h"
  953. + #ifdef SOUND
  954. + #include "sound.h"
  955. + #endif SOUND
  956.   
  957.   extern Map real_map;
  958.   Boolean traceaction = FALSE;
  959. ***************
  960. *** 118,124 ****
  961.       int init_x, init_y;
  962.       int x, y;
  963.       int i;
  964. ! 
  965.       r = (Radar *) record;
  966.   
  967.       switch (action)
  968. --- 121,127 ----
  969.       int init_x, init_y;
  970.       int x, y;
  971.       int i;
  972. !     
  973.       r = (Radar *) record;
  974.   
  975.       switch (action)
  976. ***************
  977. *** 170,175 ****
  978. --- 173,181 ----
  979.           /* If there is a vehicle in this box, make a blip */
  980.           if (vehicle_flags)
  981.           {
  982. + #ifdef SOUND
  983. +         play_owner(v, BLIP_SOUND);
  984. + #endif SOUND
  985.           b = &r->blip[r->num_blips++];
  986.           b->x = grid2map(x) + MAP_BOX_SIZE / 4;
  987.           b->y = grid2map(y) + MAP_BOX_SIZE / 4;
  988. ***************
  989. *** 182,187 ****
  990. --- 188,194 ----
  991.       /* Increment the position counter modulo 24 */
  992.       if (++r->pos == 24)
  993.           r->pos = 0;
  994. +     
  995.   
  996.       /* Save the old sweeper position, and compute the new one */
  997.       r->old_start_x = r->start_x;
  998. diff -c -r ./Src/setup.c ../xtank1.3d-sound/Src/setup.c
  999. *** ./Src/setup.c    Sun Feb  9 21:46:05 1992
  1000. --- ../xtank1.3d-sound/Src/setup.c    Wed Jul  8 10:28:39 1992
  1001. ***************
  1002. *** 55,60 ****
  1003. --- 55,63 ----
  1004.   #include "thread.h"
  1005.   #include "globals.h"
  1006.   #include "assert.h"
  1007. + #ifdef SOUND
  1008. + #include "sound.h"
  1009. + #endif SOUND
  1010.   
  1011.   extern Map real_map;
  1012.   extern Boolean game_paused;
  1013. ***************
  1014. *** 279,287 ****
  1015. --- 282,298 ----
  1016.   
  1017.       game_running = True;
  1018.   
  1019. + #ifdef SOUND
  1020. +     play_all(START_SOUND);
  1021. + #endif SOUND
  1022. + 
  1023.       do {
  1024.           status = animate();
  1025.       } while (status == GAME_RUNNING);
  1026. + 
  1027. + #ifdef SOUND
  1028. +     play_all(END_SOUND);
  1029. + #endif SOUND
  1030.   
  1031.       game_running = False;
  1032.   
  1033. Only in ../xtank1.3d-sound/Src: sound.c
  1034. diff -c -r ./Src/Include/settings.h ../xtank1.3d-sound/Src/Include/settings.h
  1035. *** ./Src/Include/settings.h    Tue Feb  4 00:03:13 1992
  1036. --- ../xtank1.3d-sound/Src/Include/settings.h    Mon Jul  6 11:36:33 1992
  1037. ***************
  1038. *** 18,23 ****
  1039. --- 18,26 ----
  1040.       Boolean no_nametags;    /* whether vehicles are anonymous */
  1041.       Boolean team_score;        /* whether to use team scoring */
  1042.       Boolean no_radar;        /* turns everyone's radar off */
  1043. + #ifdef SOUND
  1044. +     Boolean no_sound;           /* turns everyone's sound off */
  1045. + #endif SOUND
  1046.       int winning_score;        /* score needed to win the game */
  1047.       int takeover_time;        /* how long you have to be in a square in order
  1048.                      to capture it (in War game) */
  1049. Only in ../xtank1.3d-sound/Src/Include: sound.h
  1050. diff -c -r ./Src/Include/terminal.h ../xtank1.3d-sound/Src/Include/terminal.h
  1051. *** ./Src/Include/terminal.h    Sat Jan 25 21:02:03 1992
  1052. --- ../xtank1.3d-sound/Src/Include/terminal.h    Wed Jun 24 12:55:19 1992
  1053. ***************
  1054. *** 52,57 ****
  1055. --- 52,60 ----
  1056.       Line  line[MAX_LINES];    /* lines drawn on the screen */
  1057.       Boolean observer;        /* True if this terminal is not controlling a
  1058.                      vehicle */
  1059. + #ifdef SOUND
  1060. +     int   rplay_fd;
  1061. + #endif SOUND
  1062.   } Terminal;
  1063.   
  1064.